From: Keir Fraser <keir.fraser@citrix.com>
Date: Sat, 24 Nov 2007 22:19:03 +0000 (+0000)
Subject: Revert 16450:5e8e82e80. Instead remove all arch-specific handling of
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14706
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=e88b181bba05f7d3db0face65127cba95310f156;p=xen.git

Revert 16450:5e8e82e80. Instead remove all arch-specific handling of
memcmp() and hence always use common/lib.c version.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/xen/common/string.c b/xen/common/string.c
index 5a357430f1..562f6cb585 100644
--- a/xen/common/string.c
+++ b/xen/common/string.c
@@ -370,7 +370,6 @@ void * memmove(void * dest,const void *src,size_t count)
 #endif
 
 #ifndef __HAVE_ARCH_MEMCMP
-#undef memcmp
 /**
  * memcmp - Compare two areas of memory
  * @cs: One area of memory
diff --git a/xen/include/asm-x86/string.h b/xen/include/asm-x86/string.h
index 5921d22c85..496b22754f 100644
--- a/xen/include/asm-x86/string.h
+++ b/xen/include/asm-x86/string.h
@@ -109,10 +109,6 @@ void *__memcpy(void *t, const void *f, size_t n)
 #define __HAVE_ARCH_MEMMOVE
 extern void *memmove(void *dest, const void *src, size_t n);
 
-/* Some versions of gcc emit references to memcmp despite this macro defn. */
-/*#define __HAVE_ARCH_MEMCMP*/
-#define memcmp __builtin_memcmp
-
 static inline void *__memset_generic(void *s, char c, size_t count)
 {
     long d0, d1;